Rollup of 6 pull requests #105425

matthiaskrgr · 2022-12-07T14:39:11Z

Successful merges:

Don't ICE in ExprUseVisitor on FRU for non-existent struct #105267 (Don't ICE in ExprUseVisitor on FRU for non-existent struct)
Simplify attribute handling in rustc_ast_lowering #105343 (Simplify attribute handling in rustc_ast_lowering)
Remove more ref patterns from the compiler #105368 (Remove more ref patterns from the compiler)
normalize before handling simple checks for evaluatability of ty::Const #105400 (normalize before handling simple checks for evaluatability of ty::Const)
rustdoc: simplify CSS selectors for item table .stab #105403 (rustdoc: simplify CSS selectors for item table .stab)
fix: remove hack from link.rs #105418 (fix: remove hack from link.rs)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Given that attributes is stored in a separate BTreeMap, it's not necessary to pass it in when constructing `hir::Expr`. We can just construct `hir::Expr` and then call `self.lower_attrs` later if it needs attributes. As most desugaring code don't use attributes, this allows some code cleanup.

...and some if-let-elses too :P

... and other pattern matching improvements

The module-item and import-item classes are attached to the item-left. Just target that, instead.

…i-obk Don't ICE in ExprUseVisitor on FRU for non-existent struct Fixes rust-lang#104613 Fixes rust-lang#105202

Simplify attribute handling in rustc_ast_lowering Given that attributes is stored in a separate BTreeMap, it's not necessary to pass it in when constructing `hir::Expr`. We can just construct `hir::Expr` and then call `self.lower_attrs` later if it needs attributes. As most desugaring code don't use attributes, this allows some code cleanup.

…TaKO8Ki Remove more `ref` patterns from the compiler Previous PR: rust-lang#105045

…y, r=oli-obk normalize before handling simple checks for evaluatability of `ty::Const` `{{{{{{{ N }}}}}}}` is desugared into a `ConstKind::Unevaluated` for an anonymous `const` item so when calling `is_const_evaluatable` on it we skip the `ConstKind::Param(_) => Ok(())` arm which is incorrect.

… r=GuillaumeGomez rustdoc: simplify CSS selectors for item table `.stab` The module-item and import-item classes are attached to the item-left. Just target that, instead.

fix: remove hack from link.rs This logic implemented in libc. r? `@petrochenkov`

matthiaskrgr · 2022-12-07T14:39:41Z

@bors r+ rollup=never p=6

bors · 2022-12-07T14:39:43Z

📌 Commit 4968af0 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-12-07T16:42:51Z

⌛ Testing commit 4968af0 with merge dee62a7e95e8a8868bf7175f7156587c70ab84e3...

bors · 2022-12-07T20:57:51Z

💥 Test timed out

matthiaskrgr · 2022-12-07T21:08:47Z

@bors retry

bors · 2022-12-07T21:29:50Z

💔 Test failed - checks-actions

matthiaskrgr · 2022-12-07T21:42:08Z

  * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master e4c9aad] (linux CI update)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
From https://github.com/rust-lang-nursery/rust-toolstate
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
thread 'main' panicked at 'Failed to update toolstate repository with new data', toolstate.rs:436:9

@bors retry

bors · 2022-12-07T21:48:32Z

⌛ Testing commit 4968af0 with merge edbac3b7b47f478b4ae5e789d87772877f9309e5...

bors · 2022-12-07T22:08:20Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-12-08T00:15:05Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

ehuss · 2022-12-08T02:35:28Z

@bors retry

dist-arm-linux hang on Updating crates.io index

rust-log-analyzer · 2022-12-08T02:48:07Z

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master e3a84d6] (linux CI update)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master e32b8ab] (linux CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master 6deff53] (linux CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master e4c9aad] (linux CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
HEAD is now at 496fb40 (windows CI update)
thread 'main' panicked at 'Failed to update toolstate repository with new data', toolstate.rs:436:9
Build completed unsuccessfully in 0:00:19

bors · 2022-12-08T03:04:54Z

⌛ Testing commit 4968af0 with merge f5418b0...

bors · 2022-12-08T05:54:00Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing f5418b0 to master...

rust-timer · 2022-12-08T05:55:52Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#105418	a67ebf583138bc6fb9400e4847f7c953477b52a8
#105403	0165790b8b5b1ee8796ac101e8d2da984ec55f50
#105400	4c251ea76d7da7cae3b2b26d4c5e8b1636898a64
#105368	c942b05540aacdbef6582c3186b617da97cab4ad
#105343	16ee0f2209e9a99ad93ce80429f6ef81e9fda0a2
#105267	bfab86835a44c996db04cf43fb5d280f8e8bc853

previous master: 01fbc5ae78

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-log-analyzer · 2022-12-08T06:29:04Z

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master c09d2c7] (linux CI update)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master 40e17f6] (linux CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master a747deb] (linux CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master 9786c5a] (linux CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
HEAD is now at 496fb40 (windows CI update)
thread 'main' panicked at 'Failed to update toolstate repository with new data', toolstate.rs:436:9
Build completed unsuccessfully in 0:00:17

rust-timer · 2022-12-08T07:55:41Z

Finished benchmarking commit (f5418b0): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.1%	[-1.1%, -1.1%]	2
All ❌✅ (primary)	-	-	0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.8%	[0.8%, 0.8%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.8%	[0.8%, 0.8%]	1

compiler-errors and others added 16 commits December 4, 2022 17:59

drive-by: move field_index to typeck results

26b24cd

Don't ICE in ExprUseVisitor on FRU for non-existent struct

d442c01

Unconditional check FRU expression, even if there are errors present

1c81540

rustc_borrowck: remove ref patterns

c75817f

rustc_attr remove ref patterns

244990a

...and some if-let-elses too :P

rustc_builtin_macros: remove ref patterns

700c095

... and other pattern matching improvements

normalize before matching on ConstKind

9f438be

rustdoc: simplify CSS selectors for item table .stab

75aef70

The module-item and import-item classes are attached to the item-left. Just target that, instead.

fix: remove hack from link.rs (moved to libc)

a9cf163

Rollup merge of rust-lang#105267 - compiler-errors:issue-104613, r=ol…

3bcfa4c

…i-obk Don't ICE in ExprUseVisitor on FRU for non-existent struct Fixes rust-lang#104613 Fixes rust-lang#105202

Rollup merge of rust-lang#105368 - WaffleLapkin:deref-even-harder, r=…

52cec8c

…TaKO8Ki Remove more `ref` patterns from the compiler Previous PR: rust-lang#105045

Rollup merge of rust-lang#105403 - notriddle:notriddle/item-stab-css,…

c75478b

… r=GuillaumeGomez rustdoc: simplify CSS selectors for item table `.stab` The module-item and import-item classes are attached to the item-left. Just target that, instead.

Rollup merge of rust-lang#105418 - BelovDV:fix-libc-hack, r=petrochenkov

4968af0

fix: remove hack from link.rs This logic implemented in libc. r? `@petrochenkov`

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 7, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 7, 2022

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 7, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 7, 2022

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 8, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 8, 2022

bors merged commit f5418b0 into rust-lang:master Dec 8, 2022

rustbot added this to the 1.67.0 milestone Dec 8, 2022

This was referenced Dec 8, 2022

More deriving on packed structs #104429

Merged

Migrate parts of rustc_expand to session diagnostics #104460

Merged

Remove unneeded field from SwitchTargets #105234

Merged

Custom MIR: Many more improvements #105356

Merged

matthiaskrgr deleted the rollup-3ngvxmt branch December 22, 2022 10:46

matthiaskrgr mentioned this pull request Dec 26, 2023

ICE: gce: expected type of closure to be a closure #119316

Open

Rollup of 6 pull requests #105425

Rollup of 6 pull requests #105425

Uh oh!

Conversation

matthiaskrgr commented Dec 7, 2022

Uh oh!

matthiaskrgr commented Dec 7, 2022

Uh oh!

bors commented Dec 7, 2022

Uh oh!

bors commented Dec 7, 2022

Uh oh!

bors commented Dec 7, 2022

Uh oh!

matthiaskrgr commented Dec 7, 2022

Uh oh!

bors commented Dec 7, 2022

Uh oh!

matthiaskrgr commented Dec 7, 2022

Uh oh!

bors commented Dec 7, 2022

Uh oh!

bors commented Dec 7, 2022

Uh oh!

rust-log-analyzer commented Dec 8, 2022

Uh oh!

ehuss commented Dec 8, 2022

Uh oh!

rust-log-analyzer commented Dec 8, 2022

Uh oh!

bors commented Dec 8, 2022

Uh oh!

bors commented Dec 8, 2022

Uh oh!

rust-timer commented Dec 8, 2022

Uh oh!

rust-log-analyzer commented Dec 8, 2022

Uh oh!

rust-timer commented Dec 8, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Uh oh!